bitkeeper revision 1.1236.1.91 (423d4522KOKTF5mJJgjNcM5gwJVm9w)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sun, 20 Mar 2005 09:40:50 +0000 (09:40 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sun, 20 Mar 2005 09:40:50 +0000 (09:40 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk


Trivial merge